The smile is back on seven-time world champion Lewis Hamilton's face as Barcelona upgrades appear to pay-off for Mercedes.