More fiddling with parsing. Sigh.