Simplifying a None-check and adding recursive get tests.