Improve default argument support

Fixes #50