Removing the ignore for #2 - when it starts breaking (I believe in future gendarme versions) it needs to be fixed.