Tweaks to Python carrier finder.