Merge "block: Avoid use of empty() which doesn't warn on var non-existence"