Builtin bounds for closures and traits, take 2

Fixed a merge conflict from #7248.