Updated lineswn and temporalwn to work with everything collected into
the experimental structure again. A bit of cleanup elsewhere.