Clean up SmartOS to keep in line w/ other platforms