LUCENE-4956: more compound cleanups

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4956@1536234 13f79535-47bb-0310-9956-ffa450edef68