Fix variable declaration in macro's.