Split handlers up a bit.