Adjust entry interface, hopefully for last time.