Minor refactoring (assertions)