Just finished Book 7 of He Who Fights Monsters, and thankfully either I'm too dense to pick up on subtlety, or he changed it when putting it in book format, or it actually happens in a later book, but the girlfriend spoiler you posted didn't come to pass. Which was a huge relief. The book...