Add proc/thread/program type rules.  Remove local linear variables for
simplicity.