Fix some references to old when-let macro, add reindent buffer command.