Use cl-flet.
Remove diff noise causing headers.