Align vars. #1659