Revert "where or while"

This reverts commit 9948761d63e93e224cbb91bcb13b1e81c41e36ce.