minor cleanups and fix a fixme in PRE preds