refactoring: benefit from shortcut evaluation