Looks like sparse indexing is starting to work. Commit for safety.