Case checks and operation ordering fixes for Degeneracy Handling