Style and test fixes.