Minor alterations to handlers to get better understanding of how they
work.