Finished 1.6 compatibility changes. With Nick Massa.