Add fixes for predicate and function source locations

[tnelson]

When declaring funs and preds, these now expand to syntax that captures source location from the use site, rather than the declaration site.