v3 Support.
Standardize the formatting somewhat.