Fix up suggestions from hlint