filemnt: Space cleanup as preoparation for further code cleanups.