Changes to match updates to the quex branch