Don't annotate package on install; annotation is snapshot's job
Alternative mechanism for option setting (needs docs)
miscellaneous changes + unit tests