Remove some complexity caused by refactorings