Merge initial swift work from neillc's fork.

Inconsistent indentation in these two lines