Fix compiler erros for final version of Swift. Fixes #25.