One fix for #1, simply do a replace on the entire body.