Fixed MARKED SNIFF VIOLATIONS of patch #16, Attached interdiff for the same.