Fix for bug with delete involving an unmapped property + changes to support cleaner Options inheritance.