More no-xxx option tweaks.