Some cosmetic cleanup for the main consumer.