Got sick of hunting for which file a predicate came from.
Some cleanup
Improve fnref naming