Follow up on regressions introduced by initial fix for redmine 6553

This is mostly a whitespace change, moving the value test into each `case`. The new stuff is for the default case.