Fixed: Whitespace creeping in in places and causing bizarre errors.