0.9.8 error code conditionals no longer required (#2987)

* 0.9.8 error code conditionals no longer required

* move the error codes to be with their brethren
2 files changed