tweaks to constant names, handling, etc

#ciskip