Minor changes to support latest Swift compiler.