Argument handling slightly stricter.

Fixes #1.