Turns out this bug has already been fixed upstream. The upstream fix includes the missing set of braces from my patch and also fixes another error found inside the block. Best bet would be to pull the patch from upstream. If you'd like, I'll generate a diff and post it here. --Jay