Slightly modified Hexel.math classes