While-exp logic is done and fixed

I think I've got the syntax-expand right now.