Reorganized geometry traits code.