Simplify opt checks