Tweaks for live-encoding (ast-offset)