Tidy up and fix verify callbacks to avoid structure dereference, use of

obsolete functions and enhance to handle new conditions such as policy printing.