Simplify some baggage