First cut at rewriting action expressions