Tag TODOs

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
Use consistent coding style for spaces after ','

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>