More work on rebasing. Also made predicates more specific in some cases to avoid including baselines.