Increased consistency

This commit unifies the usage of type-safe and logical comparison
operators.