fix #17: allow MDC variables in message expressions
reorder methods