Unified builtins2

This is to make sure the constraint is in nomal form before unfolding.