Updated for latest bjz/cgmath-rs