remove unused struct member.
Put macro-arg in (...)
Improve ESI error messages

Suggested by:	scoof