Minor adjustments to not_system_id_macros.