Non-reviewed patch support refactored.