Revert "Relax expression requirement"

This reverts commit 3772b941a63d49e4db0f20c28322e52334bd5507.
Remove estraverse and support comments