Added temporary support for METADATA.
Added extras to mapping.
PEP 8 and whitespace tidy-ups, removed PEP 386-related code.