Fix assertion arguments order
Avoid a new hash object
Simplify code branch, remove #tap