Addressing #1092 and cleaning things up - at the loss of a pretty little line of code