Minor style tidy up in metadata code

Replace an if/else that spans many lines with a 'continue' for
legibility.

Change-Id: I2510197b39b2df53720339ee950a46ef80cd5c6f
Merge "Minor style tidy up in metadata code"