Remove unnecessary unwrap
Shuffle around check-lexer conditions