Simplify option handling with to-args
Update packaging