SSA preparation

Some minor changes from my SSA branch. The nasty stuff follows a bit later.