Make enum-contains-trait detection more robust