Removed the need to hand-code kwarg Python funcs.

By adding two more macro helper functions. This addresses issue #28.