Switch Empty() and Equals() over to use common