Document more macro features.
Tighten up macro docs after unifying the two include macros.