Avoid expression being 0 and simplify

Fix for #46283