More places to cover pre-compiled sheet names.

Change-Id: I9dead89e990297abee185a8a64b0d2f4a86f5c70