Restoration of tentative context parsing using the words array this time

Now that we have the source file split into separate words the context
parsing can be updated to work with this simpler method.

Also some more syntax improvements and reorganisation