Adjust logic for current comment level tracking

If I wasn't rushing, would sooooo write the tests.  But, oh, well.