Reworked the spec to close all remaining issues.