Minor style fixes.
Fixed support for 1.8's string-based item ids.