Clean up exported functions. Update keyboard utilities.