Fix regression in style editing (update).

This fixes a regression due to a wrong resolution of a merge conflict
in e47fb85e (base mask implementation).