rename, simplify, test variable-length int code