Use ContextTypeAttribute during migration discovery

/cc @rowanmiller & @emilcicos 

I also did some manual bashing on this for additional functional verification.
Will change.