Be consistent in naming functions. Fix bug in utility function GetOperand.