Simplify optional handling.