Remove: subindexing operation for numbers;
Change: some constant names.