Formatting/spec fixes.