Fix expansion in comment.

Ta, @LordAro, for pointing this one out
Move INVALID_ID and POSITION_PERIOD to headers.

As per @LordAro's suggestion.  Avoids duplication.