Fix bugs in helper argument parsing