More cosmetic changes to approvals code

Change-Id: If3c9ea524d15f20c278d49a944e6ab24ef00d419