Trivial cleanup to support WhileDo stmt integration

Working on a BasicBlock issue for WhileDo stmt integration.

1) Clean up #include dependencies in bb.h and then compensate downstream

2) Tweak the output for AstDumpToNode to display loops a little better and show node ids in a few places