Different types of index entries are no longer combined

Fixes #20.