Use new-style system-id macros.