More header pruning, use of cmath constants, etc.