Now complies with FindBugs level 16