Cleanup (Redo)

A.9.3. moved to A.1.4. with same changes in B.