More parsing cleanup