- fernmelder: code cleanups