Restore *true* whnf

Whoah, that is way more manageable. I guess one learns from his
mistakes...

Add UIP example