pkkm Enable lexical binding everywhere; refactor (minor)

Users who have contributed to this file

• pkkm