Allow both grouped and non-grouped arguments

Fixes #132.