Last bit of API finagling for Lucene compiliation

 . still quite a number of test failures