Modify existing support functions to use new immediate constant predicates.