More conversions of with_imm_base to with_base

This eliminates more instances of with_imm_base and makes the code more consistent.