Simplify index entries; fix #1712.
3 files changed