Smaller and faster entity comparison

This reduces the size by a bit over 100 bytes and improves performance a
tiny bit.