Pretty printing enhancements