[PATCH] Move the other parameter fixup code into fixup_options()