Another intermediate code cleanup commit