Modified to handle current_timestamp as a special case.