Cleaned up armour of thorns and israfel aftereffects

I think this finally closes #347.