Use new hash syntax

The scope of this change, though, reveals some opportunites for
refactoring.