Ensure do/else|*/end are inlinable, closes #966