Reworked how the mappers indexing syntax operates.