Minor tidy

* Validate SCIDs once, upon initial retrieval.
* Rewrite validate_scid() to require fewer line breaks.

Change-Id: Ib58b05bc01caf8d6fddbe8e18c27155295933bde