Enhancements suggested by hlint