Updates to include details of macro assignment operators.
Some further shuffling and corrections.