Bit of cleanup on #1653