Remove conditional logic for method definitions

* Even though these methods are not needed under 1.9, I think it's
  better to add them explicitly so that they can be tested under
  all code paths and my all metrics systems.