@parndt I'd need to see if the test cases still pass. I agree that the current code can probably be refactored. However to fix the issue I didn't want to obfuscate the necessary change behind a refactoring.