ditch: Some consistency changes and other tweaks