Fix option/site option assertions

Fixes #9 (again).