common: Don't include zero length blocks in template output

These just confuse all the other logic.
bridge: Substitute package name even for unknown packages

Substituting with a zero-length string is just plain unhelpful here.