ivory-opts: back out changes to decompose assertions into local vars
until i have time to fix shortcutting issue.