Issue 466 (add/drop PrimaryKeys)

Please review.