Minor improvements by introducing getters and setters instead of combinators in tokenizer

Change-Id: I31425a3ac991efb131d33a18b6ff012098ddeac8
42 files changed