Slightly improved parsing structure