Removing magic numbers
Deal with all word-alignment requirements explicitly