Updated for Doorstop-0.5.