Partial conversion of platform_swaying over to being strict.