Update the migrations

Make sure we're using the proper type in the closure
Form management cleanup (more to come)
Toss a little code in for L4.1 when it comes
Fix a wrong using statement