Work started in 0.4.0dev.