Elak/Dist: light code cleanup

Add a bunch of FIXMEs.