More SDL simplifications