Small Predef cleanup

Rebased and improved #3553's fix for SI-8229.
Also rename Predef.conforms to Predef.$conforms so it can't accidentally be shadowed.