fr8x: some more cleanup.