Allow using variables in conditions, replace argument checking with this. Fixes #31