Forego the Old Bookshelf, Especially in Structures

I want the original Bookshelf completely removed and replaced by the Chiseled Bookshelf. We can do this in structures such as the Stronghold and the Village Libraries, which can both utilize them for loot in the form of Books and Enchanted Books. The Chiseled Bookshelf even can have better utility than the old Bookshelf for Enchanting Table setups, by not only the amount of Books in total for each Chiseled Bookshelf, but with also Enchanted Books being able to influence what enchantments you'll get from the  Enchanting Table.