More trig refactoring.