Suppress if-warnings in template code

The purpose of that if is as a place holder, and you will insert
additional id's there. Right now you get a warning on the if that
you can merge in the final return, but that makes the code less
readable. Also add some padding around the if.

Change-Id: Ia3c2fddb604b260d03aada98d4a379f8a50574ec
4 files changed