Some avoider module cleanups