Simplify faac removal, deal with escaping issues