Merge branch '21-scalars' into 23-objects
Merge branch '16-t-varop-mm' into 23-objects
Merge branch '21-misc-cleanup' into 23-objects
Merge branch '21-misc-cleanup' into 23-objects
Merge branch '21-misc-cleanup' into 23-objects
Merge branch '21-misc-cleanup' into 23-objects
Merge branch '21-scalars' into 23-objects
add const to suppress warning
Merge branch '23-objects' into 24