Merge "Small code cleanups to MWCallableUpdate"