Refine normal form condition checking