That would be epic, wouldn't it? All this dramatic build-up and Merlin gets caught polishing Arthur's armor with magic.

I think, though, after this episode, Merlin's going to be a lot more careful with his magic, so maybe the writers were just trying to stave that possibility off or something...they're so unpredictable!