m4: cleanup init some more

Change-Id: I0a7fe3117c2a1a1abe27ad83006426b7020c2097