Made HLint happy.
Committed old changes.