abf/abf-ideas#83: small refactoring according to Alexander's comments