Modified expandwight.h as per feedback.