BlueZ v0.88: code cleanup