Faster Conversion to Normal Forms

I think it's fine.