HSEARCH-1510

Various cleanups:
 - https://hibernate.atlassian.net/browse/HSEARCH-1510
 - https://hibernate.atlassian.net/browse/HSEARCH-1566
 - https://hibernate.atlassian.net/browse/HSEARCH-1567
 - https://hibernate.atlassian.net/browse/HSEARCH-1568