Switching off style syngleton, improved collect_expansion_commands.