Fill in the core picker. Make menu radio items not set state to itself.
This isn't needed anymore.