(1) Get rid of compiler warnings (a) in expand.c on 64-bit systems (b) in