Add a few options targets helpers to catch up with recent work, and try
to keep them in the order they're run.

Sponsored by: Absolight