Code style improvements to SqlEntityInfoBuilder

This is a direct follow-up to I1ae5245.

Change-Id: I626bb5a949ab90f51f5021e64a292de5e8d8a3e0