s3-waf: slowly getting modules to match how they look like in old build.