Consolidation of definitions

More algebraic definitions (to facilitate development of equational
theory and algebraic testing)