Cleanup calls to set_custom_vars()

Moved to passing a hash as one of the parameters to make things a bit easier to work with.