Fix util helpers to use the context-ful decorators.