Allow both grouped and non-grouped arguments

Could probably be done in a nicer way. Sundayzzz....

Fixes #132.