Additional updates to common pri files to use better scoping and conditions.