Handle more instances of "__builtin__".
Test suite adapted after :option: changes.