Fixed the stack overflows which made the demos unusable in Firefox. The workarounds we're using are incomplete and hackish.