(#1519) - avoid utils.call when not needed
(#1518) - remove dangling nulls