In particular, the query plug-in may remain something we can't deal with until a later release, but we should at least be able to attack things now like dependencies on Teiid's Assertions and ArgCheck.