Bikeshed fixes.