Some issues with variables in !include

[jediwhale]

Problems with PR #1353

Trailing close braces are consumed incorrectly. The following does not work:

!style_red{
!include PageTwo}

Multiple variables are not recognized. The following does not work:

!define x {Page}
!define y {One}
!include ${x}${y}