Bind bucket name on a separate line.
Update alignment.
Fix some inconsistencies.
Define and use internal-module name abbreviations.
Flip order of matched variables, for improved readability.