Minor refactor on SWF domain fix in #88