Minor coding efficiency improvements (credit M.Shin).