Fix to list of functions which take a user context. (Intentionally
leaving out device wrap functions for now.)