Fixed instance.pp manifest : style, concat, cumbersome conditionals