WL-2777 Fix for wrong node being passed to redirect.
Formatting tidyup.