Fix handling of nested do expressions in EEx, closes #1710