Remove debugging print.
Fix to work with new form of gf.
Merge remote-tracking branch 'jmoffitt/dave4-upgrade'