reafctoring around indicator usage, in prep for using 4 byte indicators