A few preparatory changes to position related spec text.