Minor memory and style fixes.