Move null to NullToken and true/false to BooleanToken