Tidy up item API by merging functions into switch statements.