Add captions to author notes, for brevity in the TOC.
Add more C++ rules for Let-In, Case-Of and others.