#21: Improved item generation.