Advanced token parser on identifier, minor XML doc fix.