give up (for now) on 'bundling' option exceptions together
Misc. source code tidying