Avoid warnings for users that have upgraded from pre-2.0 and do not have instance[count] and instance[hide_empty] set
Fix whitespace
Merge pull request #2341 from leewillis77/post-2.0-fixes

Avoid warnings for users that have upgraded from pre-2.0