Correct an issue with content assist for 'extends'
Correction to 'new' index pre-processor to place macro definitions at
the correct level