Cleanup nesting on IndexType specs