Regarding == vs. equals() for enums, I agree we should be using ==.