Re-enable key indexing, other (minor) cleanup