Better unit bounds checking