Clean-up after merge from guinotphil.