Minor refactoring and additions to Colut.