A tale of two excerpt tags
We were only properly doing the `%%excerpt_only%%` behavior, this fixes that. Fixes #1433