Merged some recent fixes in from Sizzle.