Accidentally added some of these back during merge. Signed-off-by: Alastair Houghton <alastair@alastairs-place.net>