If we swap these so `type` is last we could maintain BC?