Optimize `O` and `J`

The optimization at 6cd7598 is now redundant.