Also rename "ctx" argument; we shouldn't use this as name for things that are not a context.Context. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>