shift to o-o (again)

these should have made it into the previous commit, but didn't due to
technical difficulties