chisel: A bunch of cleanups and moving towards proper call/return.