Some naming improvements and optimisations by way of flattening the handler graph.