- merged options cleanup from elinks-0.12 branch