[#2578] More tweaks to reverse engineering after running through the chapter myself