Do a slightly better job of normalising some expressions.
Merge github.com:sos22/SLI
Fix up for header skew between ise and hogun.