WaE: unused variables

Change-Id: I95f0afc4b71dd62c7635f0a56b0917463db08c35
WaE: unused variables

Change-Id: I42549eaa7048a6bcb248d3bd1bb28ca2c7c38763
The #ifndef MACOSX can surround even more code

Change-Id: Ia771d36711364bcf53789b3f7a623582451d175d