Bug 23371: Fix CSRF similar to r64677 covering the other three execute()