Adds a return type to HomeServerTestCase.make_homeserver and deal
with any variables which are no longer Any.