Minor: Style and warnings.