siimage: coding style cleanup (take 2)