Scrutinizer suggestions

Although, it's screwing up dead-code detection for the switch statement
in JsonFile