It wasn't properly padding the width of the constant zero. Also add a test that shows the buggy behavior. (cherry picked from commit 0c93a121)