Some reorg of weyland.

Apparently I wasn't thinking clearly when I set this up vefore.