Move out SchemaContext FIXMEs