various small cleanups to uses of @code form