Move model annotations where they belong.