Oooops, mucked up the merge slightly; fixed.