Updates to avoid server variables - want to keep as self-contained as
possible.