Small bugfix, to accept null for type as "no change".