Sunny Swift: Trim runaway

Issue 38