removing quite a bit of redundant cruft. Handler objects are a good organizing principle.