x: Remove theory about deprecating one
x: Rewrap header comments (no content change, just whitespace)