Use make-local-variable for imenu-generic-expression

Also fix indent.

Re commit 869ca2a