Additional statement level visitor fixes.