[#3] Took out number+boolean parsing.