Changes in 42387b73 now require namespace specification and broke abc69c89.
There are additional helper functions in c530ca00, but this seemed easier not to rely on them.