Do a little bit of optimization for P3 / P4.

Margit