Code layout fixes.