Turned tokenizing macros into functions and fixed Travis issue