I got rid of `fixup_opts`, so I think that I'll leave this in for now.