Shifting to regex, converting to chunks and other simpler features.