Rename valuedef to valdef for shortness.
Realign.