Some cleanup and spec fixes.