2014-07-11, 15:34

(minor tweaks for tighter implementation of local conventions)