Move set_package_properties and add_feature_info calls around to more sensible ordering and positions.