Allow multiline mixin arguments (rebase)

rebased version of #629 ... 78/78 (all) tests pass

Closes #473, addresses it in a more thorough way.