Removed unneeded import.
Further progress on #8. Now have fall back when expanded matches are
found.