A few FormStateInterface-related updates