Isochronous centres and foci via commutators and normal forms