Added more POD.

  Renamed the callback.

  Only add the callback if it is available, to avoid issues with
 the test-suite.