Remove some opaque conditional