Reverted change to `values` and `indices` to be recursive for now, and updated remainder of code to follow refactoring into Structure.