Resolves issues introduced in 24ebbb4e0c.
24ebbb4e0c
* Automated using https://github.com/myii/ssf-formula/pull/296
* Automated using https://github.com/myii/ssf-formula/pull/292
* Semi-automated using https://github.com/myii/ssf-formula/pull/285