Option parsing tweaks.