Use positional parameters for helper_method + some re-org
Misc fixes to make mergeuser work in client apps