Fix borked memsets...

(I should not be using those for initialisations...)
minor cleanup