Remove attempts to quieten compiler static-checking (more)