More work on threading and proxy simplification