Improve ignorals as per #104 (need to roll out to other projects over time)