Consolidate Annotation.controlled_attribute_id and controlled_value_id into controlled_attribute and controlled_value objects