Clean up use of some MetaDataManager methods (for NUCCORE-1117)