Removed a failed attempt at fixing garyb's TODO, moved some code around in resolveDcons