A bit mroe wps/skin engine cleanup so that the structs the wps uses can be static: