Some refactoring, adds a failing assertion.