ABNF alignment (#442)