Add support for some commonly used options.