Fix (hopefully) 4.01isms.