Minor cleanup.  Also slight change to criteria for static block falling.