This was a fairly trivial change ultimately.

I just went back and reverted some of Kristian's changes to preserve
consistency.