While you're shopping, pick up a small tube of die-electric grease.
Apply a small dab into each wire end, before you plug them in.
This will surely help getting them off next time.

__________________
2007 C 230 Sport.