Also: - Fixes for r14058 - Removal of a macro no longer in use - Code comments as to my opinion on the current state