Wixfeat4190.2

Cleanup after review, removed dead constants, properly marked some parameters as optional, and removed unnecessary read only check.