Move Feature_Type_Choices to toplevel name sapce