Bug 12556: Simplify and correct logic in holds-table.inc template