Also a couple of minor tweaks to try to future-proof the code a bit better against future locktag additions.
