Better assertion names; adding type checks