Better variable replacement support.