Preparatory work for later blur fixes.