Fix up some cargo-culting...