Some refactoring around handler levels.