Work in progress on consolidating the whitespace story