[REF] changes suggested by @guewen

Set a keyword argument on the context to better respect the convention.
Make it clear in docstrings that the side-effects on field_names are
intended.