GUI-337: Cleaner approach for updating policy statements.