More work on tweaking PTVS code base for J requirements.