wmload: Incorporate changes from asload-0.9.3.