Minor style clean-ups and target generation fix.