Small whitespace parsing improvements. Distribution refinements.