Fix -Wcovered-switch-default and -Wunused-private-field warnings.