git-trunk/app: Make the code more idiomatic

Change-Id: 3b0ec23baa