Fix for #411: iHate fails with singletons.

Create regression test for #411 and fixed the issue.

Also, I suppose there was some undead whitespace lying around causing a weird diff. Should have been fixed by my text editor now.