Fix the TODO parser

The last TODO elem was almost always left out from the returned value for simple use cases.