Finally (?) fix obscure parser/de-pipelining interaction issues