Tidy up options with their respective bundles.