Layout of comparator output cleaned up a bit