Use new row type syntax to reduce builtin magic.