Add logic rather than use tiny clever expressions.