Debug logs for identities prints their name.
Cleanup if statement.
Pretty nasty change to let the .y file work with older versions of Bison

This is so the Travis CI build machine will work properly...