Debugging fixes

Dead code in assertions required some cleanup to be able to make
debug compiles.