Simplified by option helper macros (see porters-handbook 5.12.4)
Deleted