Oops.  Doubled up on the identifier check