put back block around local variable declarations