Greater support for builtin classes.