Fix some warnings

This patch fixes some of the -Wall warnings. I haven't touched the ones generated by test/Test.hs cause there's too many.

I've renamed some variables to avoid shadowing. Let me know if you'd prefer something else.