OrbitControls: Code clean up and addressed concerns raised in #3989.