use more macros and do not du null-check before free:ing, free does that for us

Signed-off-by: Mattias Andrée <maandree@operamail.com>