Sync with changes to template for defines.