Use lexical binding
Use cl-letf; only activate 'use-package on init
Cleanup indentation