Yet another goddamn common code update.

Signed-off-by: chthonic7 <fooliot@gmail.com>