Merge "Use reference instead of pointer for WordProperty()."