These three "remove builtin" lines where moved from elsewhere or are new? I'm not able to locate then in the refactoring...