Fix issue with empty binders in top-level declarations