work-in-progress towards full normalization support