#1639: More selective means of preventing form redirect.