More changes related to PEP 426 support.
Improved metadata handling.