Updated for changes to Swift noted in #1