Change swapper markup again

Should perform a little better, and the markup is added in script, as
it should be
Also remove deferSetup from enquire calls, as they're not doing
anything