Robert Shearman : ole: Remove some duplicated code.