Added handling for more Carp strangeness. (#2)