Implement C05. Minor util refactorings.