Refactor away guard
from MetadataOperation::Update
#1318
+52
−79
Merged