Fix option bundling.

The code to split core from command options was not handling bundled options
properly. We get around that by simply removing the bundling when doing the
splittin. Resolves #108.