Change class registration syntax to avoid pairs.