Fix and simplify comments; make figure transclude properly

Fixes #2360