That would probably make sense, but I was shooting for minimal changes necessary to support my code.