Collection-handling fixes; ldwa config.