Clean up calls that pass plain char to macros.