More wither etc protection for blocks inside machines

See #18