More Haiku-based fixes, this time eliminating an issue where having multiple spaces would have it incorrectly claim a Haiku wasn't such. Haikus should also have correct capitalization now.