Minor tweak before more major stuff.