Carry's changes in common for compatibility, arith with new quat functions, and nlcf.