Escaping tweaks (closes #226)