fix(chatty): Handle a few things in a more angular way.