Fixed option declarations.