Clear remaining issues raised by Alisdair.