Continued work on index-based functions (#23).