Concepts lite-compatible predicates + a smidgeon of cleanup.