Cleaning up LookupComponentIndex. (#40)