Trivial spacing and comment changes
Trivial reordering of functions in headers &c
Hardened operation functions against a NULL operation pointer