Issue #5: Some code clean-up in vectorizable AST