phase1: remove isChangeBuiltin() handling