Additional changes from review

dereference arguments before comparing them