Use new-style system-id macros everywhere possible. I hope I haven't