Updated for changes in 0.9.12.