Use more efficient next_char() instead of substring(1)