Improvements to handle simpler-minimondex.