just more ruthless refactoring of L3 code.