Fix some 'recursion depth exceeded' cases
Fix inappropriate type being passed to add_last_reply