Minor changes for programming convenience.