Minor formatting and simplification cleanup -- no functional changes intended.