Fix recursion in ConstantOptimizerVisitor
Improve method invocation
Update TODO.md