Better behavior for #59.  Air blocks still need work.