I have also found M3 taps to come in handy in places you wouldn't expect. Please do replace those Philips heads though!