Optimization of Straight, Two-Dimensional Diffusers by Wall Contouring and Guide Vane Insertion