Made changes suggested by HLint.