REVIEW-3001 Refactoring, avoided ids when creating the binary stores. Not sure if this is much cleaner.
Checkstyle