Move expansion from !OLD! to {new} into convert_old_commands()