Substantial changes in the Decomposer and associated parsing files.