I don't like that these take both an enum type and a string name as arguments -- let's have them take just the enum.