Fix wrong forest type replacement in the prior commit (rP20301).
Just for the record (as all of that is going to be deleted soon), add the missing variable declarations that were hoisted from an unrelated loop prior to rP20146.