Refactor of wurflengine usage.