white space fixes, I guess... not really sure what happened (maybe my editor
did it). Either way, it was causing merge problems, so commit away.