This is a correction to 8077f2eab287703b77350f1bfc9db2bd236dd9a7, which
changed a variable name in only one place and broke the subsequent
reference to it, departed from the naming convention used in the rest of
the module, and shadowed the type() builtin along the way.