Small tweaks to make the code match the Summer Festival and Hallow's End modules.