Merge "Reduce duplication in Neutron reclass"