Remove type conversion hacks now that DFS works