14.m: minor cleanups