Flesh out options due to recent code changes.