I would prefer not to convert them. Our developers are used to sql files and we don't need db-vendor independence or something like this, so the annotated sql files are a good way for us.
As the simple contexts work there, it would be nice if the combined would also.
As the simple contexts work there, it would be nice if the combined would also.