Some refactoring

Small shortenings here and there
it would probably be better to use rackunit's define-check for these instead of just define, so that the failure messages have the right source location, check-name, expression, params, and all that.