Slightly improved sindex unit test and cosmetic changes.
Refactored delayed sindex clearing. Added some TODOs.