Trivials

Some trivial improvements which I've extracted/isolated from other ongoing work.

 - https://hibernate.atlassian.net/browse/HSEARCH-1626
 - https://hibernate.atlassian.net/browse/HSEARCH-1627
 - https://hibernate.atlassian.net/browse/HSEARCH-1628