Remove unnecessary code
Add more flexible rubric rule lambdas

This way, rules don't have to specifiy all of the possible arguments,
just up to the ones they need.