Get special data more cheaply (closes #14); cleanup.