Updated floraform to do escaping less agressively :-P