Better variable handling.