And replace them with a more appropriate type Also fix up some minor module problems along the way
keys.target