Bugfix: $empty was not always set; yields spurious notices.