* Switch to keyword args where we can without breaking compat.
* Use add_table_options! for :options, too.
* Some code polish.