Improve robustness of options macros.