Clean up static-checking just a little.