Style fixes for the enforce_type branch