Simplify layout parsing and kill 'then'.