Improve parsing of magic args, closes #38