Performance improvements
(thanks to Jann Horn)

3 files changed