Remove "excessive" null check
Modify logic in hoppers/chests